Fixed track ends - #141