finally fixed forge patches