Fixed merge error.
Merge pull request #4488 from DaBungalow/fix-issue-#4182

Fix for issue #4182