Repaired on/off functionality.