[iopq]

The bug fix might be the high risk change, since it's a hack on top of a hack that you think might cancel each other out