Address another review comment