updated for Drupal 7.22