We ran across this issue as well in a project for a client and created a solution for it!
This tutorial talks about the issue, and how our code fixes it as well as walking you through setting it up.
If you have any questions feel free to tag me!
Happy Wednesday!