Fix for issue #1457
Merge pull request #1483 from erwinwinder/master

Fix for issue #1457