Fix #1745
Merge pull request #1830 from sjinks/1.3.0

Fix #1745