bug fixes. PanZhangMaZhong
Bug fix