Fix order of stuff