Fixes #240 (closed) Avoid changing trajectories just to make visualisation look nice. :-(
Closes #240 (closed)