work on issue #39