The solution I proposed in the first comment is easy and doesn't seem to have any negative consequences as far as I can see, so why not implement that?
The solution I proposed in the first comment is easy and doesn't seem to have any negative consequences as far as I can see, so why not implement that?