[3.8] Fix patch issue