Nintendo announced it will ship more units of the Super NES Classic Edition when it launches in the U.S. on Sept. 29. Additionally, Nintendo said it will also be bringing back the NES Classic Edition in 2018.

“Due to incredible demand for the upcoming Super Nintendo Entertainment System: Super NES Classic Edition system, Nintendo plans to ship the retro-inspired product into 2018. Originally, shipments were announced to cease at the end of this calendar year,” Nintendo said on its press release.

“In addition, more units of Super NES Classic Edition will ship on its Sept. 29 launch day in the U.S. than were shipped of NES Classic Edition all last year, with subsequent shipments arriving in stores regularly. Fans have shown their unbridled enthusiasm for these Classic Edition systems, so Nintendo is working to put many of them on store shelves.”

Nintendo fans have been having a lot of problems pre-ordering the SNES Classic Edition from various retailers online. Some users were faced with major technical problems from retailers making it near-impossible to pre-order the classic console last month.

GameStop’s website for example briefly went down during the pre-order rush. Some users even experiences getting their pre-orders cancelled via email or invalidated even before they’ve reached the checkout page.

Those who wanted to pre-order the SNES Classic at their local branches were met with long lines. For many stores, it was difficult to know for sure which retailers actually had any in-store deals. Some would even go to local retailers only to find out that they would only accommodate online pre-orders.

Last week, Nintendo of America president Reggie Fils-Aime downplayed the various retail fiascos stating that the company has “dramatically increased” production of the SNES Classic. Fils-Aime also warned fans not to over-bid on the SNES Classic from any auction sites, possibly hinting at today’s announcement.

“I would strongly urge you not to over-bid on an SNES Classic on any of the auction sites,” Fils-Aime told the Financial Times (via Ars Technica). “You shouldn’t [have to] pay more than $79.99.”

The SNES Classic includes 21 Nintendo games, including the previously unreleased “Star Fox 2,” according to The Verge. Other games included with the console are “Super Mario World,” The Legend of Zelda: A Link to the Past,” “Mega Man X,” “Super Mario Kart” and “Donkey Kong Country.”

Nintendo previously hinted in June that it would deliver “significantly more” SNES Classic consoles than the NES Classic from last year. With today’s announcement, it seems the company is keeping its word. Speaking of the NES Classic Edition, Nintendo also said the mini version of the classic console will return in 2018. However, the company didn’t give out any specifics regarding an exact release date.

“Next summer, Nintendo will also bring back the Nintendo Entertainment System: NES Classic Edition system with new shipments. More information about the timing of the return of NES Classic Edition will be announced in the future,” Nintendo said.

The NES Classic Edition first launched back in November 2016. Nintendo then discontinued the product this past spring, but indicated that it would only be temporary, as pointed out by Kotaku.