Solving plotting go back and forth by plotting separately when there is overlap. See merge request !88