Major Changes bug fix