Change guard timing to apply consistently