Patch for an Issue #944