Fixed another todo