No need for this TODO, we have issues