The logic in here didn't expose the infinite loop issue we saw before (the positioning was perfect to *not* cause the issue). I adjusted this to expose the issue.