Hotfix #886
Merge pull request #888 from waveney/wav26

Hotfix #886