fix bug #1480
Merge pull request #1703 from bitwangyaoyao:2.4_fix1480