Fixed issue #454
Merge pull request #459 from zsxwing/issue454

Fixed issue #454