Fix of ccadaptive2p assertion error See merge request !425
mentioned in commit 33bd15c9
mentioned in commit 27ecf588