fixing ondemand