I just bought a Navihawk AT with the black rubber strap. I decided to buy a replacement orange rubber strap from panatime.com. I bought a 22mm strap but the strap keeps falling off. I put the pins in tight but they keep popping out. Has anyone else experienced this? Is it because the strap end is straight and the OEM black rubber strap is curved where it meets the watch?