S42 not recording the shot within 100 yards of the pin

My S42 does not let me record the club I used when my shot is within 100 yards or less of the pin. If I’m 150 yards out and I hit a shot for 100 yards so I’m now 50 years from the pin, it does not ask ,e which club I used and proceeds to keep adding the yards up so my two shots of 100 yards and 50 yards become one shot of 150 yards. It should have finished the 100 yard shot, asked what club and then show a chip for 50 yards.  Garmin actually sent me another watch and it does the same thing so it’s not my watch. Anyone else experience this?  It only happens when I’m within 100 yards or less of the pin.  I don’t see anywhere on the watch to manually stop the shot and input your club??  Any help is appreciated!