Lets fix the other part of #1157
Merge pull request #1164 from waveney/wav31

Lets fix the other part of #1157
Merge pull request #1165 from eternaldensity/master

Version 3.5221