fixed issue #140