Fix according to: https://drupal.org/node/1837312