fix for #1825

fix for #1825 for 1.5.X