Fix issue#282
Merge pull request #284 from lilyfan/issue#282

Fixed Issue#282