[Skyedriver]

1997 940 Estate:
Driving along with dipped beam and main beam randomly flashes, sometimes staying on and won't go off.
Initial thought was the switch but I've tried to replicate it when parked up by wiggling the stalk and that doesn't seem to bring on the high beam when low beam is selected.
Is there somewhere else worth looking before I buy a replacement switch to see if it is that? Anyone have a switch they don't want or want to sell?
Thanks in advance