One more fix and remove useless todo comment