Using temporary fix for indices changing