new fixing from davide
new fixing from davide