Modification as suggested by cyrille

Modification as suggested by cyrille