Fix issue #1451
Fix related classes for issue #1451
Merge pull request #1454 from zsxwing/issue1451

Fix issue #1451