This gives the normal fields the same chance as the later saved fields
New version with little fix