+ fix for loading of Drupal data.