Fix eventType being deleted from wrong object