VPP modified some state checking logic