Merge pull request #1702 from stevewithington/candidate

bug fix: #1656