Fixing bug with fields.