Fix issue #382