Continuation of the Steve Fenton fix

Again thanks Steve. I was stuck on that for days - which is a great case
study in how compilers are useful (when they work).