Fix bug of listing events twice