potential fix for #1745