Yeah, that's the generalized form of the current patch, so I agree. I'll test it after lunch.