Fixes issue 3076
Merge pull request #3193 from Snuffleupagus/issue3076

Fixes issue 3076