Fixed event removal bug