potential fix for #1818