PLA-554 fix