fixed issue #147