Fix overrides without main field