What is ETA on the fix for this, this workaround doesn't work 100% of the time for me.