issue #146 and #147