Fixed BUGs with baozu and zhixin