Fix for #7

Fix for #7, resolved the problem for me