Try a fix for #4438