Fixes #10

tested and works well