Restored correct timing