fix xiaozhang