Quick patch for 0.19 release