Fixed location on track after two tracks are joined.  May also solve "flipping problem", see #150