work on issue #102