Possible fix for #497