Fix: Issue 2232679, drupal.org