Fix for an Issue #379