Bug fixing :(