PLAT-36 Fixed