Merge pull request #1259 from sjinks/1.2.4

Fix #1258