Fixed adding fields bug