Issue #379