[PLAT-5040] Bug fix