potential fix for #1966