PLA-1806 check value earlier