Fixed compatibility with the latest version of Drupal 8