Bug fixing level 2