Fix #324
Merge pull request #329 from adisos/patch-2

Fix #324