fix change tracking for ComplexBaseFields