fixed issue #131