Updates to bug fixes for recursive calls