possible fix for #926