work on issue #157