Merge pull request #4154 from br101/horst-fix