Bug fixing part 2 :P