Yes, in Lopez, on one of those rare days when they actually grasp the correct interpretation of the Commerce Clause, or close enough. IIRC, unable to resist their own statist impulses or take a chance of interfering with those of federal legislators, the court included an explicit roadmap of how to write a law stripping us commoners of our rights and word it in such a way that even that feeble level of regard for the Constitution and our rights might be avoided. Congress paid heed, and rewrote the law in a "Constitutional" form. Such are the results we get on one of those cold days in Hell when SCOTUS bothers to read CONUS.
Need to read up, I don’t think it is a problem but I may have missed something here.