Oops, quick fix.  Main problem discussed in earlier commit still exists
however.