fix bug 263782
4 files changed