Readd the quickfix

It turns out the bug was just rarer then I
thought, and it hadn't gone away; this means
the fix is till needed.