possible fix for #2292