Fix #1449
Merge pull request #1453 from sjinks/issue-1449

Fix #1449