Oh, right you are.

I don't know how we could make it only modify the right parameters. I like your patch as it is now.