expression modif
merge fix