merge fix (wrong number of parent fields)