fixed some indices