Merge pull request #255 from quocpeyrot/issue254

Fix #254