fix remaining review comment