Fix bugs;