Partially fix #1702
3 files changed