Fixes 724
Merge pull request #787 from DessaiImrane/fix-724

Fixes 724