fixing a major event bug