resolves #1
missed fix, additional fix
Merge branch 'hotfix-1' into develop