Fix for an Issue #346