GPS on Open Water Producing Bogus Tracks

My Fenix 5 has been recording bursts of tracks which are not even in the water but on land half a mile away.  I have the watch set to lap at 500 yards and the autolap times when the gps goes crazy are between 1-5 minutes when it usually takes me at least 10 minutes.  Its very annoying and distracting to have the watch vibrate on the autolap when I know it is incorrect.  The watch has version 20 installed.  I almost do not want to use the watch on my open water swims.