Code review: 159620043:  Fix for issue 87.