fixing more indices