Fix bug in previous checkin.