Fixes #615
Merge pull request #790 from DessaiImrane/fix-615

Fixes #615