Fix for an Issue #1065