An active-duty U.S. soldier, whose Dodge Challenger Demon 170 was sold out from under them while deployed in Iraq, is now getting the car they originally ordered. Of course, they’re only getting it due to media attention that prompted Dodge to step in and clean up the mess made by one of its dealers. To make amends, the automaker has arranged for the delivery to take place at Jay Leno’s garage, with the celebrity himself present to hand over the keys.

For those who might have missed it, Mac Haik Dodge in Flowood, Mississippi, allegedly sold two Demon 170s out from under customers simply to secure higher markup profits. In the second case, the car they sold was originally built for a customer who wasn’t immediately available to take delivery because they are an active-duty service member deployed in Iraq. Needless to say, when the situation came to light, the community was outraged at Mac Haik.

Read: Dodge Dealer Allegedly Sold U.S. Soldier’s Demon 170 While Deployed In Iraq

A whirlwind of bad press surrounded the dealer and the Dodge brand. Now, the automaker has stepped up to mend fences with the original buyer. In an effort to do just that, they’ve agreed to transfer a Demon 170 that was originally intended for one of Dodge’s top dealers and sell it to the service member in question. While it isn’t exactly the spec he ordered, Dodge is going the extra mile by repainting it and fitting it with the correct options.

Next, the car will head to Jay Leno’s garage, where he will personally hand over the keys in what is sure to be a highly publicized event. It’s a significant victory for the customer in this case – they are getting a great car, from an automotive enthusiast like Jay Leno, and at the price that Dodge itself suggests. At the same time, Dodge doesn’t really “win”, as customers often equate dealers with the brand.

Mac Haik, the dealer network that initiated this entire situation by selling cars out from under customers, appears to be the biggest loser in this scenario. For the rest of us, that certainly feels like a victory. It would be wonderful if buying a car at MSRP after signing the dotted line with a dealer were as straightforward as it sounds. We have reached out to Dodge for additional comments on the situation and will update this post if and when we receive a response.