Fix "ON" detection