fix for PLFM-2494