Fix for an Issue #401