Working on patch to fix provisioning sandbox