If you have your switch out, resolder all the connections on the internal circuit board. Dry joints on it often cause problems.

Hen