Added a fix for drupal.org/node/525592