Amendment #17 to S.2021