Fix language regression caused by cleanup
Merge pull request #1480 from ke-yu/fix_regress

Fix language regression caused by cleanup