Fix issue #2023 - apply this patch https://drupal.org/node/2152935