Recursive bug fix

Introduced in the previous PR. My bad!