Merging and fixing a theoretical infinite loop.