Unit test
Fix #1314
Merge pull request #1317 from sjinks/issue-1314

[1.3.0] Fix #1314