restored correct order on admin events