Change to avoid checking OVH time at each call