fix for #PLAT-539