[Back] Fixed Notes Issue