- Fixed recursive call support