Fixing issue with last notes popping up when they shouldn't