Fix the timeline... sort of