Bug fixing added