Updated patch for version 3.0.7