Fixed some indexes