334 custom field conflicts

This resolves the issues discussed on #334