PLA-1487 code fix