ON_TIME fix