Fix overrides without main field
Merge pull request #31 from sseemayer/master

Fix overrides without main field