Fixed the infinite loop at it's core. No need for the side step like the last commit.