fixed adding and removing fields