fixing indexes again