fixed issue #138