fixed #5731
Merge pull request #591 from chuanweizhang2013/v3.0-rc0-hotfix

fixed #5731