fix #4039
Merge pull request #4041 from giantlock/develop

fix #4039