Fix the ordering a bit more, really convoluted