Drupal 8 compatibility (fixed).