I'm guessing that the alleged "secret Executive Order" that's apparently out there may be the "fix" for 1802 in terms of applying it to terrorist organizations and/or individuals.
I say this because PATRIOT Act II - which was filibustered last week - also included a fix or two for FISA, in particular making terrorist individuals subject to FISA without respect to an "organization", but again not really fixing the little hole or two in 1802.
And if the NSA ends up spying on a U.S. citizen? The "U.S. person" definition "does not include a corporation or an association which is a foreign power," according to the same law. An "agent of a foreign power" is anyone, citizen or otherwise, who "knowingly engages in sabotage or international terrorism, or activities that are in preparation therefor, for or on behalf of a foreign power." Which means that people who do not help al-Qaeda or other terrorists are safe from surveillance. Anyone who does, however, forfeits his rights and can be targeted for eavesdropping.