Fix for events firing too often