fixes overlap of fields