> if you can come up with such a safe change, I will of course gladly

> accept it.

It is attached.