Senator Jeanne Shaheen (R-NH) Fixes #501