Fix ondemand again?