Fixed issue #138