Index fixed

Need to go through roll-backs at some stage...