same comment regarding this TODO as the other one