Removed the "TODO" from the previously fixed bug