Fix Events Controller