Bug fixing 302