fix #7616 - invalid field changes