Fixed a bug with the notes infrastrucuture