Its a valid concern; for the sake of argument I would point out that it hasn't changed for 12 years but you never know...

Your solution seems logical.