Fix #2251
Updated
Merge pull request #2274 from dreamsxin/2251

Fix #2251