Call CMP. Their Armorers are more than happy to talk about your problems. I got mine in a nice hard case all put together. The serial number on it was very close to the one I used in Korea in the Corps. Can't go wrong for what they charge.

Better to be over the hill than under it.