Hotfix for #3597
Merge pull request #3600 from armab/patch-2

Hotfix for #3597