Added an patch to avoids a problem on Pixel.