Bug fixing in branch