Fixed next hop calculation