Change onDemand default value to true