Bugfix for https://jira.intra.politaktiv.org/browse/PA-775