Apple says it’s resolved an iMessage server issue that was affecting former iPhone users who switched to Android and other mobile operating systems. This is all good and well, but Apple’s text message woes don’t end there. The company is currently working on another SMS intercepting issue, according to Re/code. Apple is struggling to keep track of phone numbers that used to be linked to its iMessage platform. This is causing some ex-iPhone owners’ text messages to be absorbed by the company’s servers before reaching their intended contact.

Apple says that it’s working on a solution that should come in the form of a future software update. Until then, the best workaround is that a departing iPhone owner manually disable iMessage before deactivating their handset. This should prevent any text message hiccups on your shiny new HTC One M8.