work on issue #154