closes issue #442
Merge branch 'bugfix-442' into develop