Add temporary fix for event handler