fixed issue #161