correction of 339052e and getting #825 working.  Prelim and not the final fix I want, but better