Address one more code review comment