fix assert ids
Merge branch 'fix-assert-ids' into cc5