Fix #1284
Fix #1284 (2)
Merge pull request #1286 from sjinks/issue-1284

[1.3.0] Fix #1284