Ïmproved doc and prevented 1 eventuality