Fixing some bugs
Fixing some bugs