Small improvment