Index error on latest fixed and reordered