P40 Mag catch replacement?

[Kirkcdl]

Well,it appears as if the mag catch on my P40 is not holding the mag up tight enough resulting in FTF "nosedives",and an occasional dropped mag.The ledge on the mag catch that actually fits in the mag body looks pretty chewed up,I think it needs replacing.I think the way to remove/replace the mag catch would be to slide the mag catch spring out from below the catch body through the slot in the catch body.Is this correct?It looks like the spring is what holds the catch in place...Anyone have experience changing this?Thanks...