Patch for an Issue #919