Patch for an Issue #892