Made History event delegation more robust