Fixed submitted event bug