Hm, I'll have to look at that patch before this one then.