allow fast moving to/from on_demand mode