work on issue #152