Trying to fix index