Reorder commands to hopefully fix things