fix for issue #3685
Forward #4022 Merge branch 'wryck7-hotfix/3685' into develop