work on issue #57