Per The Mac Observer and Re/code, a long-standing iMessage bug that failed to deliver some text messages to users who switched to Android or Windows smartphones from the iPhone will be fixed.

The problem can crop up when someone who currently uses an iPhone sends a text message to someone who switched from an iPhone to an alternate smartphone platform, but keeps the same phone number. Apple’s iMessage system sees the number as still attached to an iCloud account, and fails to send messages as regular SMS to the new phone. The sender sees the messages as delivered even though they never made it to the recipient.

Removing your phone number from iMessages before switching to an Android or Windows smartphone should prevent that from happening, but that hasn’t proven to be a reliable method for moving back to standard SMS texting.

Apple has now acknowledged the problem, and promised a fix is on the way. “We recently fixed a server-side iMessage bug which was causing an issue for some users, and we have an additional bug fix in a future software update,” the company offered in a recent statement.

The announcement came on the heels of potential legal action against Apple over the issue. The case implies that Apple is in some way blocking text messages sent from iPhones to other smartphones and is penalizing switchers by not disclosing the issue.

Apple has yet to offer any form of comment on the possibility of litigation in this case.