doMast: YET ANOTHER FIX (2)