Fix #2386
Merge pull request #2387 from dreamsxin/2386

Fix #2386