Updated patch for future kernel versions