@guilhermeblanco can this TODO be fixed before it goes in?