Fixes #147

Fixes #147