bug fix: issue #760 - duplicate code
Merge pull request #848 from stevewithington/develop

bug fix: issue #760 - duplicate code