Thanks for all the inputs.
Will first take the switch apart although it looks like a tricky job!!
Then if that fails, i'll look into a new battery.