patch two-tier issue