issue #379