Fixing extra fields