Enh : Fix #943
Merge pull request #946 from DessaiImrane/master

Enh : Fix #943