After event mode fixed

#16