Fixed the random event issue