patch updated by pawit to stop fail of one hunk