Merge pull request #1640 from sjinks/1.2.5

[1.2.5] Fix #1637