Code review: 176860043:  Fix for issues 20, 28 and 37.