Yes, unfortunately, I haven't found a good solution for this issue. We have a partial fix in 5.4.1 but I don't think it will fix this particular issue.