Don't call yourself call yourself call yourself...
Merge branch 'fix-method-loop'