Bug fixing in progress