Patch for an Issue #893