Yep, that would do it. I was just pointing out that this needs to happen in a few places.

Thanks for the double check