Correct custom fields