Better fix for MONDRIAN-1432.