Bug fixing..