Fix #793
Merge pull request #1182 from getnikola/fix-793

Fix #793