work on issue #129