Bug fixing 297