Diamond provisioning fix