fix #5545
5 files changed