Fixed. It was fine, the TODO was wrong.