Fix #795
Merge pull request #797 from Mikayex/dev

Fix #795