potential fix for #2136