issue #602 attempt
Merge branch 'hotfix_issue_602'
issue #602 merged