Fix extra fields validation (Ref #69)