fixed event emit firing