Patch for an Issue #1011
Another just in case update for an Issue #1011