issue #395