Pla 1279

PLA-2179 fix