Fix destroy event issue