Fixes #464
Merge pull request #465 from ROMB/fix-#464

Fixes #464