tiny modification on setup-and-deploy