few modifs related to #62