Fixing a TODO