possible fix for #589