Fixed issue #417
Merge pull request #453 from zsxwing/issue-417

Fixed issue #417