Bug fixing part 2.