More generic patch for an Issue #994