Fix bugs
fixing bug