fix: avoid max recursion errors in ast code. #1774

fix: avoid max recursion errors in ast code. #1774 #1487