Fixed recursive calls