fix assert
Merge branch 'feature-try' into develop