Fix diagram order