event controller fix