Let's do this fix in a separate PR.