Devices shipping with Android Q will receive over-the-air security patches without having to go through device manufacturers.

A lack of steady security updates has been a major pain point for Android users over the years. Google finally has a fix for the problem. At its annual developer conference Tuesday, the tech giant said it’ll bypass mobile makers and push security updates directly to devices.

The benefit is that users won’t have to wait lengthy periods for device manufacturers to test and quality assure the patches for their devices for fixes to critical security vulnerabilities that put users at risk.

Better yet, the updates won’t require Android to restart.

Security updates for Android Q will be focused on 14 modules crucial to the operating system’s functioning — including media codecs, which have long plagued the Android software with a steady stream of security flaws.

There’s a catch — two, in fact.

Devices updating to Android Q will not work with over-the-air security updates, according to The Verge. Google said device makers can opt-out of updating some but not all of the modules. The new feature will also not be backported to earlier versions of Android. According to distribution data, close to half of all Android users are still on Android 5.0 Lollipop and earlier, it could take years for Android Q to match the same usage share.

Still, Google has to start somewhere. Android Q is expected out later this year.

Updated with clarified remarks by Google.