potential fix for #1800