Fixes #22 all together