Hotfix. A missing commit for the last merge #1475

Closed swuest closed 7 years ago