Fixed issue #428
Merge pull request #430 from zsxwing/issue-428

Fixed issue #428