Better fix for drupal template issues.