Fix: Different fields setting bad values