turn signal stalk

My 1.9 litre Z3 has an intermittent fault in the turn signal. Sometimes I can signal a right turn and sometimes it doesn't work. Sometimes I can get it to work by flashing the high beam, sometimes I can't. I'm pretty sure the mechanism needs to be replaced. I'm not too bad at wrenching, but I...