Added an important qualifier to the TODO