CommCare temporary fix