Fix for duplicate hop problem