Fixing different issue with initial index;