Better fix for setup.sh