actully fix the order bug