Go back to ONDEMAND bug fix