DF-4895 fixing for split flag too