Fix the order this is run in