reflected review comment #50