Public restroom diaper changing

V

So.... my son all of a sudden has developed a fear of getting changed in public restrooms. He's 7 months. He'll start out fine every time but within 5 minutes, he'll begin to panic and try to roll over then begins to cry and scream bloody murder. Anyone else having this issue? Any tips on how I can calm him? I'm thinking a toy to distract.