fixed issue #152