Patch for an Issue #1016