Remove todo after fix.