I'm not sure the fix doesn't already exist in the legislation as it is and perhaps redirecting the energies to the resources going to the people to use the laws as they are now. That may be your fix, because we may be just complicating our lives for nothing here.
On November 14th, 2007. See this statement in context.