Updated patch for 1.5.4