Updated patch for new master branch