Fixing #149

This should do the trick.