Fixes #149