Tweak suggested by LucidCrux and bugs--
Merge pull request #896 from waveney/wav26

Tweak suggested by LucidCrux and bugs--