Fixed flickering problem on adding fields