Apply patch http://drupal.org/node/737816#comment-6978566