fix bugs from zeng