Apple’s iMessage is great if you live in the iOS ecosystem, but when you try to leave the walled garden, receiving your texts on your new device can be troublesome, to say the least. But according to Recode, a fix is on the way.

The problem rears its head if you keep the same number and switch to a non-Apple device. Your text messages can get trapped in iMessage, and you may not receive them on your new device. “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,” Apple told Recode in a statement.

The iMessage issue, which has been a problem since the SMS-replacement was introduced in iOS 5 back in 2011, is now the subject of a lawsuit by a woman in California, who is seeking to turn the case into a class-action lawsuit. The plaintiff claims that the iMessage bug is hindering customers from attaining the full value of their wireless contracts once they leave the Apple ecosystem, and keeping carriers from servicing its customers properly.

Apple should have a fix ready to go relatively soon for the iMessage issue, as they are scheduled to show off iOS 8—the newest version of the mobile operating system—among other things, at their Worldwide Developer’s Conference on June 2.