Fixing TunnelSegment Cleaning