A fix for Issue #40

Scratch of own irritation.