* fix issue#7476
3 files changed