Fix world event optimization