Replaced bad TODO with good TODO