Fix #266
Merge pull request #587 from eryx/dev

Fix #266