Fixed refecth_track function