PLFM-1627 More fix