Fix issue #147