Here is the patch I mentioned. (oops!)