Repair the Note handler