multiple hop field fixes