fix: multi-line with-statements exit correctly. #1880

fix: multi-line with-statements exit correctly. #1880 #2008