Fixed missing event issue (temp)