Deceptively simple! I bet the code here fell behind the core's way of doing this. If these parameters are the same on 6.1 and 6.2 then this solution is obviously perfect ;)