fix fatal bug
fix merge with stephane
merge2