Apply this fix to the other setups as well