Fixing bugs;