The fix

From looking at the code formatting it looked like I had something there at some point, but I must have goofed when editing it.

I was going to include the patch inline too, but the code formatting here is bad.