Again check if switch is on

@phamann, can you confirm logic