H.R. 1022 ,introduced by McCarthy in Feb.2007, “fixes” all the issues in the 94 AWB.
Sorry, happy fingers......