Fixed to use default track already implemented upstream