Thanks for the fix, I've put it into the mainline. I am not bothering with 2.2.x unless someone asks, since moving over the 2.3 seems to be happening fast.