Fix track skipping on end