fixed issue #139