Welcome to WPML support. I'd be happy to help you with this.
The issue is still on our developer's queue and they are still trying to find a better solution for it, until the solution is out, you will need to use the code provided in the previous ticket.
I will update you here further when it will be included in the release.
Mmh, this problem is out for quite a while. I have "millions" of wpml fixes in my functions.php i´m not able to follow up (delete them) cause i don´t know if the fixes are already implemented or not. In regards of this bug i need to remind myself to do the changes in wpml core files on every update.
I spent hundreds (literally) of hours with wpml bugs. It´s tirering.
A lot of words to try to convince you that it would be nice to see your answer with the anouncement of the fix as speedy as possible 😉