Quick patch for #1341