Issue #1723

I make a fix for Issue #1723. Please interview it and give me some suggestions.