Fixing bad patchset