fixed assert ids for master #512
Merge branch 'bugs/512'