possible fix for #550