Bug fixing 29 oct