Turns the fix for #1137 (closed) into a hotfix. See also #1141 (the original pull request to develop).