apply patch from https://www.drupal.org/node/1488686 fixes #5456