Bug fixing part 1.