working on issue #139