Fixing bug..