Did you mean to fix the workaround?