working on issue #22