I took the oil pump off today and as it popped the lug on the cover snapped off.

Part number 021 115 109A.

The gears are 24mm and the pump itself seems fine.

I've seen the CB performance maxi 1 unit with numerous leak issues and the need for some modification.

Is there anything on the market that is a bolt on replacement without the above issues (except stock) that can be bought.?

Stock 1.7 motor.