Index fix still buggy