BUG (fixed): recursive bug