Fix #3816
2 files changed