Redo patch to avoid fuzzy