Helicoil it.I did same thing a few years ago on the d16 and it held up.And easy to do,as I was a noon then.