Fixes #4437: