Some more fudges needed while waiting for pull request #138

Spotted by FROGGS++