fixed issue #154