Fix #4337
5 files changed