Fix generation of new values and insert too many checks...