Fixed Event Controller Again