issue #382