I will point to one very specific statement that I have often seen.
"...the right to keep and bear arms....."
It doesn't say 'shotgun,' 'pistol,' 'revolver,' 'rifle,' 'flintlock,' 'musket,' 'gatling gun,' 'machine pistol,' etc......
Seems to already be covered by the amendment itself. What needs 'fixed' is the rampant attempts to conflate that into firearms and regulations restricting thier 'keeping' and 'bearing.'