working on issue #61