Patch for an Issue #935