fix for PLFM-1730