Fix note event issue