[PLAT-5038] Further fix