New bill looks close retirement loophole for injured federal first responders