After some legislative fits and starts, lawmakers are again in the process of honoring the memory of Army Capt. Humayun Khan by naming a post office for him in Charlottesville, Virginia.

Congress signed off on a piece of reworded legislation on Friday, ever so slightly tweaking a bill originally passed in December 2018 to name a post office on the University of Virginia campus after the fallen soldier.

Unfortunately, that bill, authored by former Rep. Tom Garrett (R-Va.), mistakenly attempted to rename an independently operated contract postal unit ― a legal no-go ― instead of an official outpost run by the U.S. government.

The new version, sent along by House Speaker Nancy Pelosi (D-Calif.) on Friday, changes the location to an official post office near the original. The Senate passed the revamped bill in early March. President Donald Trump will still need to sign off on the changes for them to become official.

Khan, a Muslim American soldier killed at age 27 in Baqubah, Iraq, in 2004, was posthumously awarded a Bronze Star and Purple Heart. Per the Richmond Times-Dispatch, he was the only University of Virginia graduate to be killed in action during the Iraq War.