potential fix for #2192