pierre fixes
merge