As this one is already merged we should change this in a follow-up-PR.