Thelma Fantastic: One good patch deserves another...

oops accidentally solved one problem and triggered another. This should help.