Fix and improvment