Patch for an Issue #992