Fix #4679, for real
2 files changed