Fix the setup