Issue 3545

Hopefully this is the last pull request....