Don't infinite loop
Merge branch 'avoid-infinite-loop'
v2.4.4