Fixed another TODO