Fix issue PLAT-100