work on issue #45