WeiGuanYu
bug fixes