s7. Fix on the selected track issue