Deployment Fix#6