This merge request should correct issue #1 by replacing entries in the loop hash table instead of adding a new entry. The correction has been tested with the two contexts of the issue.