Further refinement of the the Fix for #54