fix to event controller