Fix for PLAT-285