Duplicate code
Merge pull request #2846 from hhermsen/patch-1

Duplicate code