Had a spare indicator stalk assembly with a dodgy switch so "upgraded" it to a SPDT toggle switch. Seems to work OK but requires a bracket to be made up and the switch position to be exactly centered with a semi flexible sleeve put over the 2.5mm wide toggle to remove the slop when inserted into the 5mm hole of plastic slider attached to the stalk.