fixed some indexes