working on issue #60