e28f9b3 Fixing some bugs