Bug fixing....