Correct address calculation for VPP-1168