It might be hard to remember amidst all the God Of War hype, but the Nintendo Switch is a very popular console. And thanks to its scarcity last year, there are many people who still don’t have one. Or maybe they were holding out for something huge like Super Smash Bros, but now that’s happening as well. It seems like there’s no excuse not to buy a Switch. That was until a resourceful Reddit poster found out that an improved version is on the way.

While the Switch was getting rave reviews and taking over gaming culture last year, there was one problem with the console. The controllers, known as Joy-Cons, kept de-syncing. Since many Switch games encourage you to use motion controls, having one of the tiny, Wiimote-esque controllers continuously disconnect during gameplay was a frustrating experience that many Switch owners shared. Even worse, the problem was entirely with the hardware, something that Nintendo couldn’t just fix with a widespread software update.

Now it seems like a fix is on the way in the form of an entirely new batch of Switches. Reddit user Regnbyxor found that Nintendo filed some new paperwork with the FCC of the United States. The records can apparently be viewed by the public, and they reveal that Nintendo has slightly altered the construction of the left Joy-Con to prevent connection problems. This means that Switch consoles that hit store shelves a few months from now will hopefully be free of syncing issues.

While its not a game-changing update, it will at least save future Switch owners a fair bit of annoyance. As such, Regnbyxor felt people should know in case they’re planning to buy a Switch soon. It might be better to wait a few months for the fixed units to make their way into the world.

Of course, with E3 so very close, there’s also the possibility that Nintendo will reveal some kind of special edition of the console. Perhaps a Super Smash Bros. variant or something to celebrate Pokémon’s alleged 2018 release. Whatever your preference, the best course of action seems to be to wait until at least the summer before deciding to buy a Switch.