Proposed patch for v32