Fix #4639
Really fix #4633
2 files changed