working on issue #70