I like this. I agree our first way was still not great, but this definitely cleanly fixes the problem.