Bug fixing more