Fix the setup list