Fix #1379
Merge pull request #1381 from sjinks/issue-1379

Fix #1379