Fix for 51603
7 files changed