working on issue #93