potential fix for #993