issue #183 fixed