This was quite a tricky one to solve, but I believe it should now be working correctly in version 5.13.
