Fix for unsetting a not set event