Fixed up timing complications