Starter motor intermittently free spinning

[funduro]

Bike starts fine when cold on first start up. If the motor is not up to operating temperature, trying to start it again the starter motor free runs, almost as if the bendix (I think it has a one way clutch) is kaput. Are there places that repair these bendix come one way clutch units or should I just by a whole new starter from Amazon?

 

[Jughead]