#114. Simple fix to speed up switching between trails.