fix duplicating picking up existing id in some cases
fix duplicating picking up existing id in some cases

breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval,breunigs/gnt-eval