Bug fixed for the deployment phase