Fix after Code Review.