Patched https://drupal.org/node/1003788 #76