Removed TODO, which is now fixed