Fixing an issue reported by Walter Bauer.