work on issue #17