Hopefully, this workaround should be fine to fix the problem.