Fix for an Issue #378