Patch for an Issue #286