fix #3962
Merge pull request #3971 from giantlock/develop

fix #3962