Fixed issue 232
Merge pull request #444 from lilyfan/issue232

Fixed issue232