Bug Fixex 1.1