Code review: 180700043:  Fix for issue 60.