6-Fix to avoid XC limitation regarding indexes