Address one more review comment