Mate of mine has a yonks old Yamaha Genesis. The fuel pump stopped working and he assumed it had something to do with the relay. Yesterday I took the pump apart and the contacts were a bit shite, so I cleaned them up, adjusted the spring a bit, sprayed the whole lot with switch cleaner and tested it. The solenoid activates, pushing the contacts apart, but the solenoid stays activated. I can clearly see the gap between the contacts. I don't know how many bikes have this type of non-return pump, maybe someone here knows if there is a pump available these days to replace it? I'm assuming that either the insulation around the contacts is no longer insulating, or something is wrong inside the pump body, leaving the solenoid permanently connected. What say those that know?