Bug fixing

-