Fix ondemand
Disable install on demand for now