I agree - I did not want to push this change potentially out of scope for this simple fix. If that seems ok though, I can do the extra changes.