Fix for event/listener enable/disable