Possibly fixed issue with index?