added additional condition
build new version
Merge branch 'bugfix/collection' into develop