Bug fixing 28 oct