Fix also applied to NoteIterator