Adding in fix for the Drupal http://drupal.org/node/1885800