Last week we heard about a pretty scary security flaw that could put your Android device at risk. Now it looks like a solution is ready to rollout for the Nexus 5 and Nexus 6.

Android Central recently spotted an update from Sprint for the Nexus 5 and Nexus 6 that promises a fix for the Stagefight exploit is coming soon. Since these are both stock Android phones it seems likely the same patch could be headed to all major carriers. It sounds like Google is already pushing the fix to phone-makers and carriers, though it could be a while before most phones actually get the update.

In case you missed it, here’s how the Stagefright vulnerability works: basically, hackers can attack your phone by sending a specific video over MMS (Multimedia Messaging Service) or Google Hangouts. If you use Hangouts, the entire hack can happen without you even noticing, while a regular text message needs to be opened for the hack to work.

Hopefully Google can push out this update to even more phones as quickly as possible, but hundreds of carriers and OEMs may make that more difficult than it sounds. In the meantime, you’ll probably want to be extra careful when using an Android phone.