work on issue #161