Possible fix for #605