Remove TODO, long fixed.