[BUGFIX] Do not create new records twice