Fix for an Issue #1055
Patch for an Issue #1056