Ensure on/off are delivered