Possible fix for #538