Fixed handling of notes.