More robust auto deployer