Fixes issue #147