United States bug fix