Yea, sure.... or make it time dependent then. It would shove one more check between the TB points and the time decider.
I personally don't care about the point of time being the last deciding factor, but I'd rather have a simple check put in front of it, instead of something too convoluted.