Refactor #4365: Fix bug
Merge pull request #1690 from pandamicro/develop-3.0

Refactor #4365: Fix bug