Patch for #3152