Fix #575
Merge pull request #577 from eryx/master

Fix #575