If you’re a Galaxy Note 7 owner, you’re in luck finally. You’ll be able to get your replacement within the next week. Samsung on Thursday said new Note 7 replacement devices will be available in the US at most retail locations no later than Sept. 21.

The update came as the US Consumer Product Safety Commission on Thursday issued a recall for all Note 7 phones sold in the country before September 15. The group said “consumers should immediately stop using and power down the recalled Galaxy Note 7 devices” and contacts the location where they purchased the devices to either get a new Note 7, a refund or a replacement device. The CPSC’s notice makes it illegal to attempt to sell or resell one of the recalled Note 7 phones.

“Consumer safety is always our highest priority,” Tim Baxter, president of Samsung Electronics America, said in a statement. “Our collaboration with the CPSC to fast-track a voluntary recall in the US addresses safety concerns by ensuring we reach Note 7 owners quickly to exchange their devices.”

Samsung launched its Galaxy Note 7 phablet in late August to much fanfare and overall favorable reviews, but users quickly noticed some problems with the device. Specifically, a “battery cell issue” caused some Notes to overheat and start fires. Airlines have banned customers from using them on flights.

Samsung’s efforts to replace the Note 7 in the US had been stalled, waiting for the CPSC to come to the decision to recall the device. Samsung has received 92 reports of the batteries overheating in the US, including 26 reports of burns and 55 reports of property damage, including fires in cars and a garage, the CPSC said. Comment below and let us know about your thoughts if you have the Note 7, are you excited to have a replacement device after such a rough patch?