bug fix: #1536: duplicate code removed
Merge pull request #1544 from stevewithington/develop

bug fix: #1536: duplicate code removed