Fixes #147