Yes - replacing the headlight switch worked for me. The push in button that I paper clip jammed in stopped the battery drain for a year befor I replaced the switch. A long test!! One of the other posts in the suburban or yukon said that they found that the sunvisor mirror was on even with the mirror door was close. Dave