fix firstpatch