Bug fixing part 3.