Bug fixing 30 oct