See my patches in previous posts. I expect that your patch would work too but haven't checked.