Fix on/off issue