Manualoff and manualon null fix