PLA-523 intend fix