work on issue #60