trying to fix: http://drupal.org/node/1245686