work on issue #136