https://www.drupal.org/node/1737182 patch