potential fix for #1926