PLA-1273 more strict approach