Fixed minor events bug