Fix hop by hop

@sqs how does this look?