Fix due to http://drupal.org/node/1630220

See http://drupal.org/node/1630220