fix #4429
Merge pull request #4431 from giantlock/develop

fix #4429