#2 Time correction support