forge patches are now applied properly