Workaround for issue 3068 - v3
Merge pull request #3135 from Snuffleupagus/issue3068

Workaround for issue 3068