Fix timing issues with large T1 and T2 values