1c0107 fix #2208417, rebase to 1.9.7

Authored and Committed by Than Ngo a year ago
    fix #2208417, rebase to 1.9.7
    
        
file modified
+8 -3