Fix #846
Merge pull request #847 from DessaiImrane/fix-#846

Fix #846