Fix issue #1660

https://github.com/Araq/Nimrod/issues/1660
Merge pull request #1661 from trustable-code/PR7

Fix issue #1660