Self-recursive bug fix