Mossberg 190 16ga Safety

I have an old Mossberg 190 16ga that is in excellent condition with the exception of the Safety . It seems that if thee trigger is pulled when the safety is engaged that the firing pin will partially release but not engage. However as soon as you click the safety off the gun will fire even if your finger isn't on the trigger! That's a little too much excitement for me!
Is there a fix for this?