Trying a fix for #585