Fix after code review.