[PVP] Fix invalid data values due to 1.8 change