If you are having issues finding a Super NES Classic Edition, know that help is on the way. The demand for the upcoming Super Nintendo Entertainment System: Super NES Classic Edition system has been through the roof these past few weeks, but Nintendo plans to ship the retro-inspired product into 2018. Originally, shipments were announced to cease at the end of this calendar year but that has changed. So don’t go spending hundreds of dollars on eBay just yet, you still have a really good chance at picking one up at MSRP.

In addition, more units of Super NES Classic Edition will ship on its original September 29 launch day in the U.S., more than were shipped of NES Classic Edition all last year. There will also be subsequent shipments arriving in stores regularly, so check your local retailer often. In a statement released today, Nintendo added, “Fans have shown their unbridled enthusiasm for these Classic Edition systems, so Nintendo is working to put many more of them on store shelves.”

The Super NES Classic Edition system features 21 legendary Super NES games such as Super Mario World, The Legend of Zelda: A Link to the Past and Super Metroid. Launching on Sept. 29 at a suggested retail price of only $79.99, Super NES Classic Edition plugs directly into the TV using the provided HDMI cable, and comes with two wired controllers.

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.

The NES Classic Edition features 30 classic NES games such as the original Super Mario Bros., The Legend of Zelda and Donkey Kong.

Sites like Amazon.com are allowing you to sign-up for email notifications when more units arrive, so that’s probably your best best to pick one up online before the holiday rush. Eager fans can be notified when the stock replenishes, and be one of the first to grab the sought after gift before they sell out again. You can sign up for email notifications right here on Amazon.com.