no infinite loop
Merge pull request #137 from willtp87/7.x

no infinite loop