event entity bug fix