Fix set up order