- fix error during the merge from esrf