I’m running 1.5.4 and have this issue. Are there any updated workarounds?