Re 13a0b68fc1386becdb31c2a118aa6c14a6a66cac this fixes a few recursion bugs