Bug fixing 1 Nov