Whiplash: fix overlapping segment