Fix for #1317
Merge pull request #1526 from AnturK/smallfix

Fix for #1317