Fix 1355256 issue

https://www.drupal.org/node/1355256