Fix #663
Merge pull request #674 from ovatsus/master

Fix #663