Index ref fix