ARTDEPT-231 | Bugfix for https://drupal.org/node/1667296