Another fix to setups