fix for issue #147