Fixing bugs 2