Fix for empty event handlers