fix after self review