Patch for an Issue #910