"avoid stripping font problem" logic improvements