Bug fixing

Bug fixing