Fix adding fields to an existing form