Added ultimate-overtaking-fix