Fix related to the changes made by EA