Merge pull request #1318 from sjinks/1.2.4

[1.2.4] Fix #1314