Fix recursion make issue