#952 Reordering working