Ok patch today contains my first attempt. Please let me know if it helped
Unfortunately since I can't reproduce on the simulator, if this does not work, I'll have to make educated changes and release them with the next patch, and then get your guys' feedback on it.