Fixes event removal