Fixing bugss