Weak patch for #635