Bug fix: avoid circle in parse. Jia changed.