Fixes #468
Merge pull request #539 from tinwelint/fix-468

Fixes #468