Fixing fields bug