Fixes #10142. Signed-off-by: Stefan Roellin <stefan@roellin-baumann.ch> Also-by: Jan N. Klug <jan.n.klug@rub.de>