Merge pull request #3176 from Segrain/master

Rejuvenate bugfix.