Fix issue #138