Fix wrong track mapping