fixed remove fields on insert