Move the TODO to the location where it should applied