97d11f5 Backport further fix for #1595917

Authored and Committed by adamwill 5 years ago
    Backport further fix for #1595917
    
        
file modified
+8 -2