fix assert id #311
Merge branch 'assert-id' into releases/1.0