Fix for issue 574
Merge pull request #740 from hintjens/master

Fix for issue 574