Code review: 175240043:  Fix for issue 27.