Fixed broken field overwriting