update according to françois remarks, thanks