Added fix for HWP in victim race/rank check